commit 299466c413995695e077dc2444da75e0e6d0db2e
Author: Maximilian Kolb <[email protected]>
Date:   Thu Jan 16 12:48:13 2025 +0100

    Feedback by Maximilian
    
    * Capitalize Hammer; see CONTRIBUTING.md
    * Simplify anchor/xref
    * Remove unnecessary whitespace

diff --git a/guides/common/modules/con_deploying-virt-who-configurations.adoc b/guides/common/modules/con_deploying-virt-who-configurations.adoc
index 3740f2a871..2180e858f9 100644
--- a/guides/common/modules/con_deploying-virt-who-configurations.adoc
+++ b/guides/common/modules/con_deploying-virt-who-configurations.adoc
@@ -1,8 +1,8 @@
 [id="deploying-virt-who-configurations_{context}"]
 = Deploying virt-who configurations
 
-After you create a virt-who configuration, you can download a script or copy the hammer `virt-who-config` command from the {ProjectWebUI} to deploy the configuration.
-Then, you run the script or the hammer command to install virt-who and to create local and global virt-who configuration files.
+After you create a virt-who configuration, you can download a script or copy the Hammer `virt-who-config` command from the {ProjectWebUI} to deploy the configuration.
+Then, you run the script or the Hammer command to install virt-who and to create local and global virt-who configuration files.
 
 For {oVirt}, {EL} Virtualization (KVM), and {OpenStack}, you deploy the configuration on the hypervisor specified in the file.
 
diff --git a/guides/common/modules/con_troubleshooting-virt-who.adoc b/guides/common/modules/con_troubleshooting-virt-who.adoc
index 759407943c..2656bfe787 100644
--- a/guides/common/modules/con_troubleshooting-virt-who.adoc
+++ b/guides/common/modules/con_troubleshooting-virt-who.adoc
@@ -1,6 +1,6 @@
-[id="troubleshooting-virt-who_{context}"]
+[id="troubleshooting-virt-who"]
 = Troubleshooting virt-who
 
 You can troubleshoot virt-who by checking the service status, logs, and by identifying configuration issues.
 
-For more information, see link:{RHDocsBaseURL}subscription_central/1-latest/html/getting_started_with_rhel_system_registration/adv-reg-rhel-config-vm-sub_#virt-who-troubleshooting-methods_[Virt-who troubleshooting methods] and link:{RHDocsBaseURL}subscription_central/1-latest/html/getting_started_with_rhel_system_registration/adv-reg-rhel-config-vm-sub_#virt-who-troubleshooting-scenarios_[Virt-who troubleshooting scenarios] in _Getting Started with RHEL System Registration_ in the Subscription Central documentation.
\ No newline at end of file
+For more information, see link:{RHDocsBaseURL}subscription_central/1-latest/html/getting_started_with_rhel_system_registration/adv-reg-rhel-config-vm-sub_#virt-who-troubleshooting-methods_[Virt-who troubleshooting methods] and link:{RHDocsBaseURL}subscription_central/1-latest/html/getting_started_with_rhel_system_registration/adv-reg-rhel-config-vm-sub_#virt-who-troubleshooting-scenarios_[Virt-who troubleshooting scenarios] in _Getting Started with RHEL System Registration_ in the Subscription Central documentation.
diff --git a/guides/common/modules/con_virtual-machine-subscriptions-overview.adoc b/guides/common/modules/con_virtual-machine-subscriptions-overview.adoc
index dd3b918766..b1b640f07e 100644
--- a/guides/common/modules/con_virtual-machine-subscriptions-overview.adoc
+++ b/guides/common/modules/con_virtual-machine-subscriptions-overview.adoc
@@ -1,4 +1,4 @@
-[id="virtual-machine-subscriptions-overview_{context}"]
+[id="virtual-machine-subscriptions-overview"]
 = Virtual machine subscriptions overview
 
 Virtual machines (VMs) require host-based subscriptions instead of physical subscriptions.
diff --git a/guides/common/modules/proc_checking-for-subscriptions-that-require-virt-who.adoc b/guides/common/modules/proc_checking-for-subscriptions-that-require-virt-who.adoc
index d0c050cd31..e0c74cedae 100644
--- a/guides/common/modules/proc_checking-for-subscriptions-that-require-virt-who.adoc
+++ b/guides/common/modules/proc_checking-for-subscriptions-that-require-virt-who.adoc
@@ -1,4 +1,4 @@
-[id="checking-for-subscriptions-that-require-virt-who_{context}"]
+[id="checking-for-subscriptions-that-require-virt-who"]
 = Checking for subscriptions that require virt-who
 
 You can check for subscriptions that require virt-who configuration.
diff --git a/guides/common/modules/proc_checking-virt-who-status.adoc b/guides/common/modules/proc_checking-virt-who-status.adoc
index 91f81cf234..0ef7626e21 100644
--- a/guides/common/modules/proc_checking-virt-who-status.adoc
+++ b/guides/common/modules/proc_checking-virt-who-status.adoc
@@ -1,4 +1,4 @@
-[id="checking-virt-who-status_{context}"]
+[id="checking-virt-who-status"]
 = Checking virt-who status
 
 You can check the status of virt-who by using the {ProjectWebUI} or the Hammer CLI tool.
@@ -12,8 +12,9 @@ The `OK` status indicates that virt-who is successfully connecting to {ProjectSe
 .CLI procedure
 * List the status of all virt-who instances by entering the following command on {ProjectServer}:
 +
+[options="nowrap", subs="+quotes,verbatim,attributes"]
 ----
 $ hammer virt-who-config list
 ----
 +
-The output includes the date and time when each virt-who instance reported to {ProjectServer}.
\ No newline at end of file
+The output includes the date and time when each virt-who instance reported to {ProjectServer}.
diff --git a/guides/common/modules/proc_creating-a-virt-who-configuration.adoc b/guides/common/modules/proc_creating-a-virt-who-configuration.adoc
index 2dca0bf4f1..a7d6348afc 100644
--- a/guides/common/modules/proc_creating-a-virt-who-configuration.adoc
+++ b/guides/common/modules/proc_creating-a-virt-who-configuration.adoc
@@ -1,7 +1,8 @@
-[id="creating-a-virt-who-configuration_{context}"]
+[id="creating-a-virt-who-configuration"]
 = Creating a virt-who configuration
 
-You can create a virt-who configuration by using the {ProjectWebUI} or the Hammer CLI tool.
+You can create a virt-who configuration on {Project}.
+To use the CLI instead of the {ProjectWebUI}, see the xref:cli-creating-a-virt-who-configuration[].
 
 The virt-who configuration creates a `virt_who_reporter_[id]` user with the `Virt-who Reporter` role, which provides minimal permissions for virt-who reporting to {ProjectServer}.
 This user cannot be manually configured or used to log in to {ProjectServer}.
@@ -83,6 +84,7 @@ This option provides additional AHV information when you enable both debugging o
 
 . Click *Submit*.
 
+[id="cli-creating-a-virt-who-configuration"]
 .CLI procedure
 * On {ProjectServer}, enter the `hammer virt-who-config create` command according to the following example:
 +
@@ -125,4 +127,4 @@ You cannot change `hwuuid` to another option after virt-who starts running becau
 +
 For VMware vSphere or Microsoft Hyper-V, specify the virt-who user password: `--hypervisor-password <password>`.
 <7> Optional.
---
\ No newline at end of file
+--
diff --git a/guides/common/modules/proc_deploying-a-virt-who-configuration-on-a-capsule.adoc b/guides/common/modules/proc_deploying-a-virt-who-configuration-on-a-capsule.adoc
index e2fb55a6c6..3e7abeb75a 100644
--- a/guides/common/modules/proc_deploying-a-virt-who-configuration-on-a-capsule.adoc
+++ b/guides/common/modules/proc_deploying-a-virt-who-configuration-on-a-capsule.adoc
@@ -1,4 +1,4 @@
-[id="deploying-a-virt-who-configuration-on-a-capsule_{context}"]
+[id="deploying-a-virt-who-configuration-on-a-{smart-proxy-context}-server"]
 = Deploying a virt-who configuration on a {SmartProxyServer}
 
 For VMware vSphere and Microsoft Hyper-V, you can deploy the virt-who configuration on {SmartProxyServer}.
@@ -16,21 +16,18 @@ Global configuration values apply to all virt-who configurations on the same {Sm
 ----
 $ scp _deploy_virt_who_config_1_.sh root@_{smartproxy-example-com}_:
 ----
-
 . Make the script executable:
 +
 [options="nowrap" subs="+quotes"]
 ----
 $ chmod +x _deploy_virt_who_config_1_.sh
 ----
-
 . Run the script:
 +
 [options="nowrap" subs="+quotes"]
 ----
 $ sh _deploy_virt_who_config_1_.sh
 ----
-
 . After the deployment is complete, delete the script:
 +
 [options="nowrap" subs="+quotes"]
diff --git a/guides/common/modules/proc_deploying-a-virt-who-configuration-on-a-hypervisor.adoc b/guides/common/modules/proc_deploying-a-virt-who-configuration-on-a-hypervisor.adoc
index 8349c4ee39..cd2259c8ad 100644
--- a/guides/common/modules/proc_deploying-a-virt-who-configuration-on-a-hypervisor.adoc
+++ b/guides/common/modules/proc_deploying-a-virt-who-configuration-on-a-hypervisor.adoc
@@ -19,21 +19,18 @@ Global values apply only to this hypervisor.
 ----
 $ scp _deploy_virt_who_config_1_.sh root@_hypervisor.example.com_:
 ----
-
 . Make the script executable:
 +
 [options="nowrap" subs="+quotes"]
 ----
 $ chmod +x _deploy_virt_who_config_1_.sh
 ----
-
 . Run the script:
 +
 [options="nowrap" subs="+quotes"]
 ----
 $ sh _deploy_virt_who_config_1_.sh
 ----
-
 . After the deployment is complete, delete the script:
 +
 [options="nowrap" subs="+quotes"]
diff --git a/guides/common/modules/proc_deploying-a-virt-who-configuration-on-a-separate-rhel-server.adoc b/guides/common/modules/proc_deploying-a-virt-who-configuration-on-a-separate-rhel-server.adoc
index edec77d469..904b35f05f 100644
--- a/guides/common/modules/proc_deploying-a-virt-who-configuration-on-a-separate-rhel-server.adoc
+++ b/guides/common/modules/proc_deploying-a-virt-who-configuration-on-a-separate-rhel-server.adoc
@@ -1,4 +1,4 @@
-[id="deploying-a-virt-who-configuration-on-a-separate-rhel-server_{context}"]
+[id="deploying-a-virt-who-configuration-on-a-separate-rhel-server"]
 = Deploying a virt-who configuration on a dedicated {EL} server
 
 For VMware vSphere, Microsoft Hyper-V, and Nutanix AHV, you can deploy the virt-who configuration on a dedicated {EL} server.
@@ -17,14 +17,12 @@ Global configuration values apply to all virt-who configurations on this server
 $ firewall-cmd --add-port="<port>/tcp" <1>
 ----
 <1> Specify `443` for VMware vCenter and Nutanix AHV. Specify `5985` for Microsoft Hyper-V.
-
 . Add a TCP port for communication between virt-who and {ProjectServer} to the permanent configuration:
 +
 [options="nowrap"]
 ----
 $ firewall-cmd --add-port="<port>/tcp" --permanent
 ----
-
 . In the {ProjectWebUI}, navigate to *Infrastructure* > *Virt-who Configurations*.
 . Click a virt-who configuration file.
 . Click the *Deploy* tab.
@@ -35,21 +33,18 @@ $ firewall-cmd --add-port="<port>/tcp" --permanent
 ----
 $ scp _deploy_virt_who_config_1_.sh root@_server.example.com_:
 ----
-
 . Make the script executable:
 +
 [options="nowrap" subs="+quotes"]
 ----
 $ chmod +x _deploy_virt_who_config_1_.sh
 ----
-
 . Run the script:
 +
 [options="nowrap" subs="+quotes"]
 ----
 $ sh _deploy_virt_who_config_1_.sh
 ----
-
 . After the deployment is complete, delete the script:
 +
 [options="nowrap" subs="+quotes"]
diff --git a/guides/common/modules/proc_deploying-a-virt-who-configuration-on-satellite-server.adoc b/guides/common/modules/proc_deploying-a-virt-who-configuration-on-satellite-server.adoc
index 797f478054..b02d9d8aeb 100644
--- a/guides/common/modules/proc_deploying-a-virt-who-configuration-on-satellite-server.adoc
+++ b/guides/common/modules/proc_deploying-a-virt-who-configuration-on-satellite-server.adoc
@@ -1,4 +1,4 @@
-[id="deploying-a-virt-who-configuration-on-satellite-server_{context}"]
+[id="deploying-a-virt-who-configuration-on-{project-context}-server"]
 = Deploying a virt-who configuration on {ProjectServer}
 
 For VMware vSphere and Microsoft Hyper-V, you deploy the virt-who configuration on {ProjectServer}.
diff --git a/guides/common/modules/proc_editing-a-virt-who-configuration.adoc b/guides/common/modules/proc_editing-a-virt-who-configuration.adoc
index b5379096ab..f31621ef37 100644
--- a/guides/common/modules/proc_editing-a-virt-who-configuration.adoc
+++ b/guides/common/modules/proc_editing-a-virt-who-configuration.adoc
@@ -1,4 +1,4 @@
-[id="editing-a-virt-who-configuration_{context}"]
+[id="editing-a-virt-who-configuration"]
 = Editing a virt-who configuration
 
 You can edit a virt-who configuration by using either the {ProjectWebUI} or the Hammer CLI.
@@ -9,9 +9,9 @@ You can edit a virt-who configuration by using either the {ProjectWebUI} or the
 . Edit the fields and then click *Submit*.
 . Deploy the modified virt-who configuration.
 
-[id="cli-modifying-virt-who-configuration_{context}"]
+[id="cli-editing-a-virt-who-configuration"]
 .CLI procedure
-. On {ProjectServer}, use the `hammer virt-who-config update` command to edit the virt-who configuration according to the following example:
+. On {ProjectServer}, use the `hammer virt-who-config update` command to edit the virt-who configuration:
 +
 [options="nowrap" subs="+quotes,verbatim"]
 ----
diff --git a/guides/common/modules/proc_enabling-rhsm-debug-logging.adoc b/guides/common/modules/proc_enabling-rhsm-debug-logging.adoc
index 9753a7ead8..57b235c849 100644
--- a/guides/common/modules/proc_enabling-rhsm-debug-logging.adoc
+++ b/guides/common/modules/proc_enabling-rhsm-debug-logging.adoc
@@ -1,4 +1,4 @@
-[id="enabling-rhsm-debug-logging_{context}"]
+[id="enabling-rhsm-debug-logging"]
 = Enabling debug logging
 
 You can enable debug logging for the `/var/log/rhsm/rhsm.log` file by using the {ProjectWebUI} or the Hammer CLI tool.
diff --git a/guides/common/modules/proc_removing-a-virt-who-configuration.adoc b/guides/common/modules/proc_removing-a-virt-who-configuration.adoc
index 09c0909c22..6e1522befa 100644
--- a/guides/common/modules/proc_removing-a-virt-who-configuration.adoc
+++ b/guides/common/modules/proc_removing-a-virt-who-configuration.adoc
@@ -1,4 +1,4 @@
-[id="removing-an-existing-virt-who-configuration_{context}"]
+[id="removing-an-existing-virt-who-configuration"]
 = Removing a virt-who configuration
 
 You can remove a virt-who configuration by deleting the configuration in the {ProjectWebUI} and then by deleting the configuration file from the hypervisor or the virtualization manager.
diff --git a/guides/common/modules/proc_virt-who-does-not-report-to-satellite.adoc b/guides/common/modules/proc_virt-who-does-not-report-to-satellite.adoc
index 7aff4f0266..34d0f0c323 100644
--- a/guides/common/modules/proc_virt-who-does-not-report-to-satellite.adoc
+++ b/guides/common/modules/proc_virt-who-does-not-report-to-satellite.adoc
@@ -1,4 +1,4 @@
-[id="virt-who-does-not-report-to-{project-context}-server_{context}"]
+[id="virt-who-does-not-report-to-{project-context}-server"]
 = virt-who does not report to {ProjectServer}
 
 virt-who might not report to {ProjectServer} if {ProjectServer} is configured to use a proxy server in `rhsm.conf` while virt-who is configured not to use a proxy server in `/etc/sysconfig/virt-who`.
diff --git a/guides/common/modules/ref_troubleshooting-virt-who.adoc b/guides/common/modules/ref_troubleshooting-virt-who.adoc
index f5bc91478e..7bf6f85ab3 100644
--- a/guides/common/modules/ref_troubleshooting-virt-who.adoc
+++ b/guides/common/modules/ref_troubleshooting-virt-who.adoc
@@ -1,4 +1,4 @@
-[id="virt-who-troubleshooting-methods_{context}"]
+[id="virt-who-troubleshooting-methods"]
 = Virt-who troubleshooting methods
 
 .Identifying issues when using multiple virt-who configuration files
diff --git a/guides/common/modules/ref_virt-who-configuration-examples.adoc b/guides/common/modules/ref_virt-who-configuration-examples.adoc
index 2ab4170163..0e6797b0db 100644
--- a/guides/common/modules/ref_virt-who-configuration-examples.adoc
+++ b/guides/common/modules/ref_virt-who-configuration-examples.adoc
@@ -1,4 +1,4 @@
-[id="virt-who-configuration-examples_{context}"]
+[id="virt-who-configuration-examples"]
 = Virt-who configuration examples
 
 You configure virt-who in a file that specifies details such as the virtualization type and the hypervisor or virtualization manager to query.
@@ -11,7 +11,6 @@ The `kubevirt` hypervisor is a Technology Preview.
 ====
 
 .Generic example
-
 [options="nowrap" subs="+quotes,verbatim,attributes"]
 ----
 type=libvirt <1>
@@ -30,7 +29,6 @@ rhsm_prefix=/rhsm
 <2> Read-only user that you create on the hypervisor before configuring virt-who.
 
 .{OpenStack} example
-
 [options="nowrap" subs="+quotes,verbatim,attributes"]
 ----
 type=libvirt
@@ -47,7 +45,6 @@ rhsm_prefix=/rhsm
 ----
 
 .KVM example
-
 [options="nowrap" subs="+quotes,verbatim,attributes"]
 ----
 type=libvirt
@@ -64,7 +61,6 @@ rhsm_prefix=/rhsm
 ----
 
 .vCenter Server example
-
 [options="nowrap" subs="+quotes,verbatim,attributes"]
 ----
 type=esx
@@ -81,7 +77,6 @@ rhsm_prefix=/rhsm
 ----
 
 .Nutanix AHV example
-
 [options="nowrap" subs="+quotes,verbatim,attributes"]
 ----
 type=ahv
diff --git a/guides/common/modules/ref_virt-who-configuration-overview.adoc b/guides/common/modules/ref_virt-who-configuration-overview.adoc
index 596c210c39..0231805794 100644
--- a/guides/common/modules/ref_virt-who-configuration-overview.adoc
+++ b/guides/common/modules/ref_virt-who-configuration-overview.adoc
@@ -1,4 +1,4 @@
-[id="virt-who-configuration-overview_{context}"]
+[id="virt-who-configuration-overview"]
 = virt-who configuration overview
 
 You install and configure virt-who by preparing your environment and then creating and deploying a virt-who configuration.
@@ -24,4 +24,4 @@ ifdef::satellite[]
 For more information, see {RHDocsBaseURL}subscription_central/1-latest/html/getting_started_with_the_subscriptions_service/proc-installing-satellite-inventory-upload-plugin_assembly-setting-up-subscriptionwatch-ctxt[Installing the Satellite inventory upload plugin] in _Getting Started with the Subscriptions Service_.
 endif::[]
 * Associate the virtual machines with {Project}.
-For more information, see {ManagingHostsDocURL}Associating_a_Virtual_Machine_from_a_Hypervisor_managing-hosts[Associating a virtual machine with {Project} from a hypervisor] in _{ManagingHostsDocTitle}_..
\ No newline at end of file
+For more information, see {ManagingHostsDocURL}Associating_a_Virtual_Machine_from_a_Hypervisor_managing-hosts[Associating a virtual machine with {Project} from a hypervisor] in _{ManagingHostsDocTitle}_..